(diff-end-of-hunk): Revert 2008-01-08 change.
authorGlenn Morris <rgm@gnu.org>
Tue, 15 Jan 2008 03:46:44 +0000 (03:46 +0000)
committerGlenn Morris <rgm@gnu.org>
Tue, 15 Jan 2008 03:46:44 +0000 (03:46 +0000)
lisp/diff-mode.el

index a088cd6ccbaa7c1423ad5458c1e15445097c5258..4c566b344a993f91e4d427588b02fc4a327feb46 100644 (file)
@@ -391,13 +391,9 @@ when editing big diffs)."
       ;; Especially important for unified (because headers are ambiguous).
       (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
     (goto-char (match-end 0)))
-  ;; Some versions of diff replace all-blank context lines in unified
-  ;; format with empty lines. The use of \n below avoids matching such
-  ;; lines as headers.
-  ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html
   (let ((end (and (re-search-forward (case style
                                       ;; A `unified' header is ambiguous.
-                                      (unified (concat "^[^-+# \\\n]\\|"
+                                      (unified (concat "^[^-+# \\]\\|"
                                                        diff-file-header-re))
                                       (context "^[^-+#! \\]")
                                       (normal "^[^<>#\\]")